Merge "Avoid calling InitializeDependencies for non image case"
am: 6aa23b5555

Change-Id: Ic0f0c0bfcea68fe2649eba9898c0b71643e5c04a