Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Performance Fix: Minimize number of advertisedHaves

Change-Id: Id19a9ef22aa7445bf8188b79d34aeb870eadb988