Merge "Remove @UnsupportedAppUsage from whitelist methods"