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

Change-Id: Ie58915ab6882725ac030a024a09b719f7f9db249