Merge "Add @UnsupportedAppUsage annotations" am: f304f4d2ea
am: 734611e34e

Change-Id: I14c15626440b2f1455110b6e504c4d18d2e5c5dc