STYLE: Fix errors detected by KWStyleCodeTest.

Change-Id: I83260b49569ae8adc80da830b6d309489c4e1950
Merge topic 'KWStyleTestErrors'

69fa532 STYLE: Fix errors detected by KWStyleCodeTest.