Merge "Reland "Remove gBn/sConstructorMap.""
am: 425c3d92e3

Change-Id: Iabf94371fb334f782af805e4df74a9aec0b49398