Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938 am: 670ba92946 am: 8bcf9aa2c4
am: e054111199

Change-Id: I2abeb0b6b9763878ae7961d96fc2014305d07f57