Merge "overlayfs: deflake presubmit tests"