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

Change-Id: I7f4be199eded99a3abc06321083a80f861f66ab9