Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev am: f80ec1583d
am: 0a0f7cea05  -s ours

Change-Id: Ie0978bbc4c2804563f7b62eb943a617ab634f95a