Add some infrastructure to support rescoping.

Change-Id: If61d01ea22ed810a584d6de32d0bd21f7427e227
4 files changed