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

Change-Id: I8573400aae3381568e1c7bcee580c05bec71aa95