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

Change-Id: Ib9ed5ce0c7c12f99be25aaabef3e53038aa03b7d