Merge "Disable ClockOptionsProvider" into rvc-dev am: 6c66c29f89

Change-Id: I04ee2f026f795358835b5048c30448c58c574b8b