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

Change-Id: Icef2e7fb527f90a44839b3f1a2f931760b6696b2