Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62
am: b85b487e31

Change-Id: Ifa60d8f2d60aba4c4e2894dc612c224d45e3992d