Local_manifest & get dependencies fix

Change-Id: I8720f9378be6756d205107c71c470671b6d8e934