Revert "Revert "Clocks were switching too frequently""

This reverts commit 1ab0ed29e45e10edb26ef71b451727b93ab281ba.

Reason for revert: Fixed

Change-Id: I7baacba6dced16bdcaecb0edec14e7fbcb5d4b30
2 files changed