does this upstream change replace the sauce patch? commit da97e18458fb42d7c00fac5fd1c56a3896ec666e Author: Joel Fernandes (Google)