Modify dependencies

Change-Id: I737f581ee4efc950fe75a78d449fc4cfe27a0e33