us #2047, refactor dependency...

Change-Id: I49985ddd5ba589811d7ed076ebf8687aa3b9fdf9