Merge "Fix hidden usage sConstructorMap"