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

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