Merge "Use new UnsupportedAppUsage annotation."