Merge branch 'stable-2.14'

* stable-2.14:
  Make ExecutorProvider return Executor instead of ScheduledThreadPoolExecutor

Change-Id: I5aa71486657cb93053a209684cfeef452b56e006