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

Change-Id: I18d4068ea567522a6a3dd6e69a8084b6e8a73368