Merge "Add @UnsupportedAppUsage annotations" am: 3610ca221d am: 72667caaa6
am: f82c47fc72

Change-Id: Id649fb3818dcf22186338b801d9e02ea49f69fbb