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

Change-Id: Ib0326535a87cc73be87801d4e48552fcac0309a5