This PR resolves the issue with the failing daily tests. Change-Id: I984b09a6b69701a7a57b36e3346e55245f2fa04a
pre-commit run --all-files