Addressing API council feedback Test: None Bug: 123223649 Change-Id: I797e293be1fbb552c54d010a379d8e87a201a57c