Fixed dependencies

Change-Id: If523d6c9189ddbb83666f0716b722c99432b4439