Unfortunately we do not have consensus on whether or how to upstream this, so it will be a downstream patch for now.
Michael Catanzaro