Fixing deprecated imports in barbican

Change-Id: I6b5c04a85451224465f6109be47f58fa8e764bdd
Merge "Fixing deprecated imports in barbican"