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

* commit '93c4c49b9185e4f0b03d6456c16e07fc6eb30710':
  Cleanup vroot test and fix false positive.