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

Change-Id: I1b4f175d0b1410d83c370a72df4608b407f8e905