Change-Id: I16a9b42651f1cfb1a70dffbb67b7b83dfeb90d03
Follows-up I9d2b148e57 (including phpunit/languages this time). Bug: 46434 Change-Id: I30e5efcd88c516121c454676bd7a18f9b7c8fca6