Agent changes for supporting IRB forwarding

Change-Id: Ic4ccac4b349c40236f530c12d1ec6ecef5eaab98
Merge "Agent changes for supporting IRB forwarding"