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

Change-Id: I22792e86d9070b4950f485cb45c115d615782065