Ensure null ConnectionService references don't crash phone.
am: 165ee7501f

Change-Id: I703ad6c95baa0ac0d3920e8ea8f61dc35ec950e7