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

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