[570995] Fix non-CGed MapType conformance
6 files changed