Merge "Translate custom clock names" into qt-r1-dev
am: ed223f341d

Change-Id: Iac9eb82c7ccbf07af7b58fd92bb261c7214b3087