Apply coding conventions for whitespaces

Change-Id: Ibd32177ac1f608fbb480d74a573c20b6487d28c4