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

* commit '03081801e73dab8a32018e64d346376731a09551':
  Cleanup vroot test and fix false positive.