Merge "Remove @codingStandardsIgnore after upstream fix"