Merge changes from topic 'heapbase' into oc-dev
am: 6480d09eec

Change-Id: Ia41d17dc04638feb999b95f12b80a289224f9450