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

Change-Id: I23eab05cf1f8edb43df6e2acb9c6ea1ce8978768