Merge "Address API council comments" into oc-dev
am: 57ed0ba69d

Change-Id: I28253a456f288da02506367a2b9039cffb1d0a25