supersonic: round 1 of dependencies changes.

Change-Id: Iacc5f00d010651fe8e8caad2f0ac7679833ea6dc