Merge "Revert the system clock in the debug oc-dev" into oc-dev