Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: Idec229f0249233b65ea8e97b2dbea61094b15097