Merge "Revert the system clock in the debug oc-dev" into oc-dev am: 4229cb80a0
am: 98af818d03

Change-Id: Id7aacffd3fa48d76003840fff8f4d48197eae936