Merge "Modifying MetaData invalidates previous char*" into nyc-dev
am: eb36bac938

Change-Id: I1a401b30afed8fccdf48c9b41ae414f7410520a9