Merge "Update LS/AOD clock" into sc-dev