Merge "Enforce assumptions around metadata_block_device" am: 62f0b8ea am: 320e821e am: c6bcdbdf am: fb4f3617 Change-Id: I357f9d599e48bc9822b38fe092b7c3df20de279f