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

* commit '8b09c2761523dfb05eb9c220f680cf2bef9c940e':
  Make the root/unroot test more robust.