Merge "Add @UnsupportedAppUsage annotations"