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

Change-Id: I8098b30d604275956615ae78a861138652fd7ac9