Merge "Respond to API council feedback." into oc-dev
am: d275dc83be

Change-Id: Ibfe675230ef74e5dea9eb7974604a66003e548fc