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

Change-Id: I574e6e2f270b8a1b9bd95e665dce240898e176d6