Merge "Add @UnsupportedAppUsage annotations" am: 058b566f90 am: 38a6375f99
am: e54e7590d7

Change-Id: Icc11a0723d4122aac7ab3110bc0cd7d80dfe1c11