Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev am: 3edfdf345e
am: 8b2360ae08

Change-Id: I69240becd307370c1bb1813ed9b61f3cea3676c7