am ec159352: Merge "Make NDC not block forever and handle restart."

* commit 'ec159352fe7fb4c6a476c3542dc65037cb57f982':
  Make NDC not block forever and handle restart.