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

Change-Id: Icdf1bdb1a934f5218d11e2ab05f4261fa64a1db8