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

Change-Id: If98b6c5068ec920ca7a4a3c9ad6c8c32ad18fdb2