Merge pull request #14915 from ZhouyihaiDing/backport-php-O2

Backport #14768 to v1.10.x