Make gBn/sConstructorMap concurrent. am: 84888d3553
am: f9517da6d6

Change-Id: I9deca55e73769f9405b11364f89fe7dbf4fe41b4