Merge "Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 am: 328b56585e am: 06c6bf67e9 am: 3f10ecabf8"