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

Change-Id: I948bca4f9ef0c8160102e9a0185a984cbdfb0f63