Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev