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

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