Add support for new root.expand() calls.

BUG=5444144

Change-Id: I9ab942561a03e9f837a3199457259bb3e07ac76f
3 files changed