Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev