am b96ecea6: 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 'b96ecea6d0fcf69555074e3ff1f5c814c81877f3':
  Cleanup vroot test and fix false positive.