Merge "AOD/LS Clock fixes" into sc-dev