Update for moving gBn/sConstructorMap into details. am: a159f3b141 am: 815916fd2f
am: 264a3144ae

Change-Id: I8be5f85e89ff00ad5afdbb9452df796f33d57627