Merge "Make phpcs-strict pass on includes/ (7/7)"