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

Change-Id: I959643203f53c6a82cc5b9cfa7d43bbb0beeb127