am 4ccca83d: am 5ec468a5: am f99e0a2b: am 2876baf7: am 93c4c49b: am 458b8144: am 088757ad: am 13aa9040: Merge "Cleanup vroot test and fix false positive." into jb-dev

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