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

Change-Id: Icc78e06e0fa248fb05aea54c8ed86f8940416bca