Merge "Use line comments for @codingStandardsIgnoreStart"