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

Change-Id: I9399e6e083baaea43bd7fdbf8a67209cd0353950