[automerger skipped] Merge "Fix unreadable clock" into qt-dev am: c442c8e5f5 -s ours
am: 1b1f3a4ed7 -s ours
am skip reason: change_id I64ee2dee14322b2c02891c3ffe5fc0b25d1f100b with SHA1 89233c49aa is in history

Change-Id: I14e428666f3793411bd5bf5df881605ecbdb6c40