Merge "Address API council feedback." into oc-dev
am: 4a71842dbd

Change-Id: Ia9511f1031463b6e65437e27e6012b8e83e8961d