Merge "Fixed build breakage due to incorrect class TypeId."