Merge "Merge "Do not translate "Wi-Fi calling" for VF DE" into oc-dr1-dev am: 256fe973 am: 1e499641" into oc-mr1-dev-plus-aosp