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 '64c902777e4e0896aeae6361ea4ae8ff2bb45e92':
  Revert "Cleanup vroot test and fix false positive."