Handle image map names that end with ]
am: 30c009406f

Change-Id: Ic334c6a841ec174fac3a000f136bbba3933d4e34