Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev