Merge "Fix fallback for emergency calls" into lmp-mr1-dev