Merge "Adjust the coding style."