Apply GJF-1.7 codestyle

Change-Id: I913e3133bbb8d46430464a8d9834026d04852d7c
8 files changed