Merge "Add @UnsupportedAppUsage annotations" am: 3d05f769a3 am: 1d526c114f
am: 92019fc32e

Change-Id: Id9e7732b1f051b8ab37fc24a4867802e0eb1c870