Depends-On: https://review.openstack.org/#/c/643093/ Change-Id: Ibd73389902935518fafda649b6d419881fe6349e