Du-ify for Lollipop

Change-Id: I0ab865ced381c6844abde638b10550219fad660a