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

Change-Id: If521f57152351ee5c5923311316862aec0d0bc8f