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

* commit '088757ad611bb636e2ea0b1f654d1007bc772759':
  Cleanup vroot test and fix false positive.