This builds on the previous commit to make it compatible with the currently locked build configuration. (cherry picked from commit bd1edec2fa5251263c768c3e2b312eb4f21d2bb4)