Merge "Fix the security vulnerability issue in AppLocalePickerActivity"