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