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

* commit '4ad964d98d058d4569925479e1314463b6a8c329':
  Swap names for clock delegates so they are correct