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

Change-Id: I4fe2cf2884e92b4630a2d90d03d55537d0b91b10