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

Change-Id: Ie0c4dd02d90b4a2890c16a06465e08e79172477a