Merge "Fix whitespace issues" am: 09b0225a8a am: f8b6504bce am: 3ab3152bbc