Merge "Add support for tz detection telephony fallback"