Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Consider setting timeout="short" or size="small"

Change-Id: Id6bdd7a008663c6a8c02227bfc70de0f8921a83d