Merge "Fix NativeDaemonConnectorException issue accessing null object" into nyc-mr1-dev