related patch set: https://review.openstack.org/#/c/551255 Change-Id: Ib10e71e5ecc7979d85f50ba4361851a3df7a9c87