Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Fix lint warning flagged by buildifier

Change-Id: I0720b94f6a655d13cfa695906b2fb8126ddcce1f