Merge "Fixed emergency alert not showing up issue"
am: bde3cdb854

Change-Id: I882dd02d4cff4f2d28f221682878bfbd42cfadf7