Fix coding-style and formatting of latest commit.
Author: Wojciech Zmuda

Change-Id: I53d14ad83dbc2de0317605622a5251612a127d02