Fix from Cindy Cicalese for "mapping template" feature

Change-Id: I2311d268a14de2d602ecc86b4806c50307837176