Merge "Pass phpcs-strict on includes/normal/"