am d36f7d24: Merge "Add support for new root.expand() calls."

* commit 'd36f7d249591559e713a8ca45c6d452c14c94895':
  Add support for new root.expand() calls.