Merge "Track ObjC object mapping"
am: fedafc879d

* commit 'fedafc879d2229210ec8e58e465ec965d3544774':
  Track ObjC object mapping