Updates to notification messages

Change-Id: Ib72c3525104421879077ddc4c6728278d6a0cf86