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

Change-Id: Ibb1b69ea313a45637558add62503a05133b3e7a9