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

Change-Id: I2d30ae5e02eccc7d860a76b7f7d116f14a40f357