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

Change-Id: I0e2fc8e10ba039872c78baef6000d630ef10a5e0