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

* commit '458b814435d9fd62a7b7ae0418a117a82cec6f45':
  Cleanup vroot test and fix false positive.