Make gBn/sConstructorMap concurrent. am: 84888d3553 am: f9517da6d6 am: a7f4c2ca96
am: 4113c001ef

Change-Id: I3db8ee56aa7b224bc31b89379288cf88d21d0bae