Cleanup whitespace

Change-Id: I9e84ce56e853a18205aa180cef1ee8ff4f2f678c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>