Merge branch 'stable-3.10' into stable-3.11

* stable-3.10:
  Set Gerrit to 3.10.7

Change-Id: Ief21db4c5bbe3d53fa3965924411e49fa7f023c7