Currently not checking import orders, this patch restore it. Change-Id: I101814591eaffb694a090aa640ca9ac70db2ecf1