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

Change-Id: I22f59817b55fe447bf457202016f130b1efdffb1