Merge "Add @UnsupportedAppUsage annotations" am: 4c3bf0f36a
am: 2658ccd948

Change-Id: I6a5f2de89c9225dc8f675ea4c824a443dc3e8e21