Merge "Remove @codingStandardsIgnore from long lines"