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

Change-Id: Ibba72870f4d4da53ab411b5e279a967a86584e19