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

* commit '332c2881305549450b162d854b139611d7bdc42f':
  Make the root/unroot test more robust.