Merge branch 'stable-3.0' into stable-3.1

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

Change-Id: Iea3d2ce15c8381bf6ede36492e1493e2b69ddd98