Merge "Remove spy() from ZenModeHelper in ZenModeHelperTest" into udc-dev