Merge "Address API Council feedback." into oc-dev
am: 06772136f9

Change-Id: I8837a81984ff1e98a78126a78298d45dc63f2e34