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

Change-Id: Ifd2455885d03fe40ac9bfbf163d3051f4e72a5ed