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

Change-Id: Ib20972a467e2520e85a6a99e3a16a934d49f93c5