Merge "Update Telecom APIs to include multi-hfp"