This is to support changes by https://review.openstack.org/268077 Change-Id: Ib193a776bff861a12cb477ee87b848815aee8641