am 550b5868: am 939c153f: am 92f291cd: Merge "Cleanup vroot test and fix false positive." into jb-dev

* commit '550b5868de56288800480f7f40739df2e51a565e':
  Cleanup vroot test and fix false positive.