Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev