Merge "Fix problems with SIM-less emergency dialing" into lmp-dev