Merge "Revert "Use new UnsupportedAppUsage annotation.""