Manta: DU-ify!

Change-Id: Ica04f34bfb9014132a3ca439e12868e54b2a121e