Assert message text for only 'discover' notifications

Change-Id: I68716518663ca462b6ef187abe90a290c7b15b2e
Merge "Assert message text for only 'discover' notifications"