am dd238b56: Merge "Attempt to fix missing clock bug" into klp-dev

* commit 'dd238b5604e14d0da458f9b7589097d365a9dfd1':
  Attempt to fix missing clock bug