Merge "Cleanup and remove call if ConnectionService crashes" into lmp-mr1-dev