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