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

Change-Id: I7f6d7087f14ed1c5e3906721ed24d9783b7a126c