Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f am: 7a10fd6a47
am: 634676e2f9

Change-Id: I12d3f4e253a51ec5683dfb1e49340f2b6cdbeec9