Applied on linux-aws/master, linux-gke/master, trusty/master-next, xenial/master-next and zesty/master-next branches. Note: from the thread history, gcp is still missing the patch. Thanks.