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

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

Change-Id: Ie3f953faf63266f26afeece41e182e89cd0c083b