Added support for disambiguating mapped labels.

Change-Id: If42db62973e6f0299d0a308ad30e55ec74230192