am a94489b4: Merge "Don\'t lose product variant strings that also vary between...
am a94489b4: Merge "Don\'t lose product variant strings that also vary between locales." into ics-factoryrom
* commit 'a94489b4':
Don't lose product variant strings that also vary between locales.