Merge "Introduce AlternativeNetworkAccess APIs"