am 9523edff: 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 '9523edff12ee0e49c72eb8293a7f1cd1aa038e8b':
  Revert "Cleanup vroot test and fix false positive."