Merge "Track ObjC object mapping"