Merge "Revert "Reland "Remove gBn/sConstructorMap.""" am: 31b8899132 am: 2e04e3e7bd
am: 30769336ab

Change-Id: Ib7b8e4152c79642c2e898dfe081db14073471900