Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381 am: ab27993c18 am: 6635787941
am: 676c9fae14

Change-Id: I11fa17bc6d54cdde853c6dff4f51a9d491b3df99