Merge "Implement comments from API review" into oc-mr1-dev
am: 3bb18be633

Change-Id: Iffceee62b2940d13916dffb03df2825d7e1a5965