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

Change-Id: Ia3058d3eacb221bb7dd379c4a7f3c9a6c149aea9