Merge "Fix clock being too low in AOD" into tm-qpr-dev