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

Change-Id: I3f4e3f74058b1f1e0af4cf5a2c095fb0c265c003