Merge "Annotate two non-SDK methods known to be used by apps" am: de441278e7 am: 32d2f8fe46
am: a5083783f7

Change-Id: I59f5f3ea5a0424036e1e715e56d8fa16572358b1