Merge "Retire ClocksFetchTask to avoid using AsyncTask"