Merge "Fix code style."