Merge "Update AOD/LS clock"