Merge branch 'stable-3.10' into stable-3.11

* stable-3.10:
  Align style with modern Gerrit

Change-Id: Ie4c0fca0b2ebf7dcab9ec0308d175d0bc68af8d4