Merge \"Fix NativeDaemonConnectorException issue accessing null object\" into nyc-mr1-dev
am: 7519df9eaf

Change-Id: Ic094b459a22a31a045ad61660694b616d7236893