Merge "Annotate two non-SDK methods known to be used by apps"