[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 196eb1d929 am: 83271288ec am: eaff9b8d78
am: a79fcdd774  -s ours

Change-Id: I30b7ec3b4f49ed479ac5855e98fde9aed701bb34