Fix fatal in MobileNotifications

Change-Id: I345ced8189784f0a632286e0f18f5f2c1669273b
Merge "Fix fatal in MobileNotifications"