Merge branch 'stable-3.1'

* stable-3.1:
  Evaluator: Replace ScheduledThreadPoolExecutor use with ExecutorService

Change-Id: I759a738e0b1330f89da4c029b9001bebee245fa9