[automerger skipped] Fixed emergency alert not showing up issue am: 90676d67 -s ours
am: 4d4b6dbe -s ours
am skip reason: change_id If32f8475cd45be01226758e2565c0008d0715e95 with SHA1 b5d94e29 is in history
Change-Id: I606319f0aaea1860f163b6b5ec40536c91b8c947