am 458b8144: am 088757ad: am 13aa9040: Merge "Cleanup vroot test and fix false positive." into jb-dev * commit '458b8144': Cleanup vroot test and fix false positive.