Merge "Remove "clocks" from string" into qt-r1-dev