Fix selected and backported from a larger patch that originally landed in Zesty and subsequently landed in upstream.
Fix selected and backported from a larger patch that originally landed in Zesty and subsequently landed in upstream.