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

Change-Id: I2890cde112e1b3bd910094774764a658079fb4e9