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

* commit '265f8106c374ce72284e86a5bb6df4514d320d51':
  Swap names for clock delegates so they are correct