Merge "Fix test testZenUpgradeNotification on watch"