Merge "tspp: use new clock preparation functions" into msm-3.4