Merge "Fix style issue."