Fix dependencies

Change-Id: I1f900d2ffc57e3f2df160882e997cb2e999c9eac
Screw Github

Change-Id: I1f900d2ffc57e3f2df160882e727cb2e999d9fac
Merge "Screw Github" into du44
Screw Github

Change-Id: I1f940d2ffc57e3f2df160882e727cb2e999d9fac
Merge "Screw Github" into du44