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

* commit 'a94489b4394350b1727437818cd4f6d845e97dc0':
  Don't lose product variant strings that also vary between locales.