Merge \\"Fix unsafe concurrent access in LegacyTypeTracker\\" into nyc-mr1-dev am: 90b2c781ff
am: cefbc970e5

Change-Id: I96d1c6fe08c17cf95056d445f6922b9f489021b9