Backport from master branch (https://review.openstack.org/#/c/96506/) Change-Id: I7a24244d98207856609b5f5ad62c4196f15d1399