Merge "Make phpcs-strict pass on includes/ (6/~10)"