Merge "Cleanup vroot test and fix false positive." into jb-dev