Merge branch 'stable-3.6'

* stable-3.6:
  Set Gerrit to 3.6.3

Change-Id: I9299590da385a4977eeea93f1673e01a1a1d8655