Fix broken notifications caused by invalid create parameters

Caused by 2e7c7d33d005b2720f1255743be6d1375b121436

Bug: 58127
Change-Id: I883b8102ce023334b09d28d5620b050535818039