Merge "Ensure null ConnectionService references don't crash phone." into nyc-mr1-dev