am 128d13bb: am c3fa1801: am 550b5868: am 939c153f: am 92f291cd: Merge "Cleanup vroot test and fix false positive." into jb-dev

* commit '128d13bbe950717a9dfc6ccdcc3bbff8b795f135':
  Cleanup vroot test and fix false positive.