Merge "Set static Dependency ref after all the Deps are set up." into pi-dev
am: 666be7b688

Change-Id: I14160dc6b18a1874808819be088d0ed9506c49ba