Merge "AOD/LS - Large clock adjustments"