(no ticket) Fixed the ****** clock

Change-Id: I5b239e3a22f4dcd2af9e757681ea1efb56435941
Merge "(no ticket) Fixed the ****** clock"