Another merge botch?  There is a log entry about adding
visualmappingmanager to this, but it's not in either branch

Change-Id: I3d1f29210fa31800dca538bc40980e98a5cb1d8f