Merge branch 'stable-3.8' into stable-3.9

* stable-3.8:
  Reformat file with gjf 1.7

Change-Id: Ief1bb5a1171e394ad19260e9a3cbc931a8e08b85