[automerger skipped] Merge "Fix unreadable clock" into qt-dev am: c442c8e5f5 am: 4b8540a4f6 -s ours
am: eab020a2d8 -s ours
am skip reason: change_id I64ee2dee14322b2c02891c3ffe5fc0b25d1f100b with SHA1 a476c79c3a is in history

Change-Id: I67a196184595ad17ec7cff209dc7a9413af783a4