Fix patch fail based on the patch land of Bug 952693