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

Change-Id: I45bcbe76a3d199b7fcc143592f1bd28091144204