Merge \\\"Notification: Respect disabled HUNs on updates\\\" into nyc-dev am: 394cc084f9 am: 8985d16a56
am: f40bf9362e

Change-Id: Ie0a6f267f5e7fe13f4d475878f38ac7063be5f2d