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

Change-Id: Id03863d7f6bb6a10ac82c504c3c64227e7286cd6