Merge "C2Allocator: protetct memory mappings from race condition" into tm-dev