Merge "Request location info in UnderlyingNetworkListener" into sc-dev