Merge "fs_mgr: overlayfs deal with verity detection issues"
am: 042f2da1f3

Change-Id: I1dbc4fa1d41943f4833151c24ecc98cb2bf494e4