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

Change-Id: I1ecdf945f60d09216e6e8b54754d4feba0437ac1