Merge changes I7b7cee68,I07d22c0d

* changes:
  ImageGenerator: add an option to specify the supported locales
  Handle rendering problem for the word "Android" and punctuations