Merge "Add @UnsupportedAppUsage annotations" am: d08509363c
am: 62a722476a

Change-Id: I52585645e23519cfc6d216e344710ad76aeea9e8