Merge "[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: cf03906edc am: a25b4e8c07 am: 03eb776b44 -s ours am skip reason: change_id I7489aad1dceeb18ed7ca48a1ed8829a668b3fa04 with SHA1 9a8b6bf0f1 is in history"