[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: f336c031 am: 230017d9 am: f8397b2d am: cc464094 -s ours Change-Id: I6a6988f37e9f571ebe9dc59b27f79606ef1d64eb