Git cherry-pick from net-next repository