Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev