Addresses prior comments on https://review.openstack.org/#/c/28835/1

Change-Id: I3bb08e583050d3a4e8dc1c6e1792021c76499a35
Merge "Addresses prior comments on https://review.openstack.org/#/c/28835/1"