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

Change-Id: I32f062c901fa3b71b5782af734b93fd8ac877d1f