Merge changes from topic "Remove InterruptedException" into tm-dev

* changes:
  [automerged blank] DO NOT MERGE: Remove InterruptedException from stub NsdService#create 2p: c12cd28561
  DO NOT MERGE: Remove InterruptedException from stub NsdService#create