NEXUS-5836: Import order, no code change