Merge "Address API review comments" into oc-mr1-dev
am: dd5afab0d4

Change-Id: Ia6f1c19275c2a06d35a344bb2e14c376c9794088