Merge "telephony re-registry error" into lmp-mr1-dev