Merge "Fix unreadable clock" into qt-dev
am: c442c8e5f5

Change-Id: Ifc3d184fbd856df515bfa527028c8e736572e14e