Merge "Ensure null ConnectionService references don't crash phone." into nyc-mr1-dev am: f036c0ba85
am: 8f2592c5c8

Change-Id: I0f7e11ddd3a3ed2d0558b1b3edac28d2366caa98