Merge "fs_mgr: Fix disable-verity for verifyatboot partitions"
am: 6bc1d38381

Change-Id: I56d6cd59a80f288632ed7ce10ce8178ceb72bec2