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