Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Buck: Fix typo in gerrit_plugin.bucklet

Change-Id: Ic91abeaf0405abc6abf162feffbb717522e4cd5d