Merge "fs_mgr: overlayfs: fsck scratch filesystem"