Merge "fs_mgr: Better error messages in fs_mgr_update_verity_state."