Fix code style

Change-Id: I0aedc35e0ecaeb13d33a81030a52fe25b4a23f33
Merge remote-tracking branch 'PA-base/kitkat' into kitkat-remix