Implement rescoping messages.

Change-Id: Ic99755629d30efe8db51da40cb0258ea23e9333e
3 files changed