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

Change-Id: I0f34bed03ee00ea5095a37bfde05105716d2535b