Merge "fs_mgr: overlay: test assumption wrong if verity is enabled" am: 4115c2caf6 am: 94cbddd155
am: 54155712d2

Change-Id: I57066721151ab5f899c20633a6a5c5675ab0ad4a