Re: Request to cherry-pick 3db09e762dc7 to 4.14+