Dependancies: Moar Derp fixes

Change-Id: Ieab0d04370c2d2e272e7176c925be8bf926402eb
Merge "Dependancies: Moar Derp fixes" into pac-4.4