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

* commit '939c153f4bf91f5f58a69543db8da24d1a57ad71':
  Cleanup vroot test and fix false positive.