Change-Id: Ib8e22a1e2e35d22a754943e34501305a0cfdd9b9 Depends-On: https://review.opendev.org/678368 See: http://lists.openstack.org/pipermail/openstack-discuss/2019-August/008416.html