Merge "Remove "clocks" from string" into qt-r1-dev
am: a4a25871d4

Change-Id: I8181952741bdb57785a48485cb09072fb38484f2