Merge branch 'stable-3.4' into stable-3.5 * stable-3.4: Reformat file with gjf 1.7 Change-Id: I859bdbade2398207ffc39051db266528ea2c8639