Merge "Remove @UnsupportedAppUsage annotations from generated code."