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

Change-Id: If84f50c50cea48f2c13c66b8e04c7fd579d8d7fa