Add bug1025973 patches