Changed the code to use forwarding service.

Change-Id: I2504ef01270f9c8e82acbe6a4069d2b4b77b35f2
8 files changed