Merge "Fix blank clock (issue 7344512)" into jb-mr1-dev