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

Change-Id: Ief37365ae7569c76633137b661a2b50e2110670d