Fixes import grouping

Left over from https://review.openstack.org/107393

Change-Id: Ic495e0f929b07f285240305d98f7d0fa73ecffce
Merge "Fixes import grouping"