As discussed in https://review.openstack.org/#/c/384073/

Change-Id: Ic1d59ce477798a92d21c384a0306fa46d82bc2d7