Merge "Make lines short to pass phpcs in six files under includes/"