This addresses API council comments. Bug: 17112978 Change-Id: I698b243b2b685d1f25414cee72450be3ae0c2bf0