Merge "Revert LS/AOD clock color change"