This is in response to API council feedback. BUG: 17253647 Change-Id: I6da2aa2510a73276fcdbad9219adfeaaed41d3ba