add cherrypicks to fix release build
Source for buildrump.sh git rev 445ac9906c1ff689cb347af9463955dd49a5973d