am 5821e5ab: am 12b851d7: am 64c90277: am ee45d5a5: am 1e934b38: am e6d74378: am fb36e884: am 43cb7695: Merge "Revert "Cleanup vroot test and fix false positive."" into jb-dev

* commit '5821e5ab7e20404da20b52b5a42193d002bfe0c8':
  Revert "Cleanup vroot test and fix false positive."