Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ia58e0e38064351a1205ffd44eeff8be96bf5f08c