Merge "Add @UnsupportedAppUsage annotations" am: fa4ccace61
am: 44787b6aa7

Change-Id: Ib8c100ee9d1a968992de1cdebb9519e1f97344dd