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

Change-Id: If8b723f4cf624e461152ec7346291cb160091d41