cherrypick softint init fix
Source for buildrump.sh git rev d1985aa8855548060062f6247a3a11bcedd0956b