Merge "Fix issues with metadata handling when format change happens" am: 92047ec34b am: d41a64c7ad am: 2a02f18cf1
am: a2e99a3de2

Change-Id: I49713b9197775f5ffb81e3c5dfa289904f760501