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

Change-Id: I49871d0872e6b4f8194d3425a59cd5661b5623b7