Merge "Make emergency NFW notification silent" into rvc-dev am: d36e74cf82 am: b3cea51e25

Change-Id: I335a9d5992c056fd647cc1ef5cb628a497f84c9b