Merge "fs_mgr: overlay: test assumption wrong if verity is enabled"
am: 4115c2caf6

Change-Id: I0bdd2064ae0b6153e10f7c5c57660abd118cc00e