Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5
am: 5d01988bcf

Change-Id: Ie96c7a5659546dfe7da6e35f2b44fc6a2574b181