WIP: Fix KWStyle detected errors.

Change-Id: I5e35b0be06894ba25ca0a242493271eacc49f521