Merge "Avoid calling InitializeDependencies for non image case"