Merge changes from topic \'blockOnProcessingUnsolicited\' into nyc-dev
am: ff0ff67ecc

* commit 'ff0ff67eccd784ccdd35b91ed182c50bb8df2d71':
  Tethering: interface updates can be handled again
  NativeDaemonConnector: add waitForCallbacks method

Change-Id: If5ac7034911298c8a3f046403d740c7f6dadadec