Merge changes from topic 'api-review' into oc-dev am: 9e7dd63dff
am: 933e12e3fe

Change-Id: Iea484b13782cd7d233c71016d1a95b5f08851064