am 43cb7695: Merge "Revert "Cleanup vroot test and fix false positive."" into jb-dev

* commit '43cb769574d559189bb1356643549f85a3984b08':
  Revert "Cleanup vroot test and fix false positive."