am 756cc397: am 8b09c276: am 332c2881: Merge "Make the root/unroot test more robust."

* commit '756cc39739a67610abaff3f2b72f6a15514f6ffc':
  Make the root/unroot test more robust.