Improve import labels

Bug: 447222
Change-Id: I016ce2a1672bf747935a6f3e0128cc2f867fcc38
Signed-off-by: Mickael Istria <mistria@redhat.com>
Merge "Improve import labels"