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

Change-Id: I6bba03a20a7cd0c2faca1c4b8168e39c1dcd6c48