Revert "Revert "Clocks were switching too frequently""

This reverts commit 1ab0ed29e45e10edb26ef71b451727b93ab281ba.

Reason for revert: Fixed

Change-Id: I7baacba6dced16bdcaecb0edec14e7fbcb5d4b30
(cherry picked from commit 6347dec97bf89c7f9b3579961aca00260f4afd34)
1 file changed