Merge "Remove InterruptedException from NsdService#create" into sc-mainline-prod