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