Merge "Revert "Rmove @UnsupportedAppUsage""