Fix dependencies #2

Change-Id: Ic654357424c4d58b8b19c5b0bace0b41da93f150