Depends-On: https://review.openstack.org/#/c/465081/ Change-Id: Id8b2defca083f86047aba445bfe73bfa7eeb6f80