Merge "Fix build: style issue."