Merge "ImageGenerator: Handle special characters in xml files" am: 697003dbce
am: f2099b7872

Change-Id: Ia0b812f6441a712bde8441c742b7777948366042