Merge "Add @UnsupportedAppUsage annotations" am: 722dff1f35
am: 7b577b39f7

Change-Id: I2d532044b9eb62ff595fa648a239b907a32d0bab