Merge "Remove @CorePlatformApi LocaleData usage in frameworks"