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

* commit '638ab1b58820a78a8e30ce8df6a8f9a97b92d503':
  Cleanup vroot test and fix false positive.