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

Change-Id: Id998d4423aaac0004afc49aa5713588d7940a1d9