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

Change-Id: I92ad1b36f7fbd1ff9b1379ccf7a561158e82029b