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

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