Merge "Update LS/AOD clock"