am acfdc30e: Merge "Fix error in clocks leading to devices staying unlocked" into lmp-mr1-dev

* commit 'acfdc30e3793512de4b9a5e15da69533735dd8be':
  Fix error in clocks leading to devices staying unlocked