Merge "Resolve NPE in getConnectionState()"