Merge "phpcs: Disable failing sniffs in phpcs.xml"