API changes as requested by API council.

Bug: 183512729
Test: m
Merged-In: I3c5a5734b4cf4f942c4f6809a0a54c2460ee2324
Change-Id: I3c5a5734b4cf4f942c4f6809a0a54c2460ee2324
5 files changed