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

Change-Id: Ia945c856b0b805111ebcb5a93908934ddaa78db1