(cherry picked from commit 16cfd59f5b368fd1d05eeeab3afbacfccf0a6870) Add forgotten override. (cherry picked from commit c6f94ba42ec7e66419b636ac09aacc1ee7320a77) Fix non-PCH build. (cherry picked from commit 02cea9c0bac2f999b461d3679a32672b6f0ac2da)
(cherry picked from commit 16cfd59f5b368fd1d05eeeab3afbacfccf0a6870) Add forgotten override. (cherry picked from commit c6f94ba42ec7e66419b636ac09aacc1ee7320a77) Fix non-PCH build. (cherry picked from commit 02cea9c0bac2f999b461d3679a32672b6f0ac2da)