Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Upgrade Gerrit API to 3.3.3
  Upgrade Gerrit API to 3.3.2

Change-Id: Ib331022db0508e60c84b6a5ed20ec52832334f84