Merge "Remove standalone requirement for glance import"