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