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

Change-Id: Iadd42f2bf9f6a6863333fae9dc26c17522cc9b28