Cherry picked from https://review.openstack.org/#/c/39171

Change-Id: Ibeb71979176a77c0b9c7398931e2dd8565424623