Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Reformat file with gjf 1.7 Change-Id: Ia0b64df2e05bd69de156cda30952247c0be142e2