Apply the feedback from API council. Bug: 25726616 Change-Id: I9858a61eea50ff95221d453117fe3d991f88a33f