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

Change-Id: I3393e6df436b084e86d054f25808f4bf38326de7