am 13aa9040: Merge "Cleanup vroot test and fix false positive." into jb-dev

* commit '13aa9040e51b2877f2a7176ca11c74866b0aedec':
  Cleanup vroot test and fix false positive.