[automerger skipped] Merge "Fix stuck notifications" into pi-dev am: 2a8a4d56
am: bc22b56c -s ours
am skip reason: change_id I56c4ba79bcf42c30ad9a0da936eb0b774a6f3f08 with SHA1 564273f6 is in history
Change-Id: I69143bcba6d4329c88cf768003d2d677ebb4aa3a