Merge "[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 842e3aa420 am: 20ebeb61a9 am: 438ec44268 -s ours am skip reason: change_id I6eba34467b2492047e5264684312adfa029eb317 with SHA1 fa152f9517 is in history"