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

* commit '2876baf7de899f0262925b37786e9022d9fefbb4':
  Cleanup vroot test and fix false positive.