Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ide139f43e915bf597a2faea0520b463422d15868