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

Change-Id: Ic57c35049eeb2ef489cca1bde6bcb2267efde385