am 1e934b38: am e6d74378: am fb36e884: am 43cb7695: Merge "Revert "Cleanup vroot test and fix false positive."" into jb-dev

* commit '1e934b384f505316445f1c719653dc63d2b1e607':
  Revert "Cleanup vroot test and fix false positive."