Fix Derp for Vivid

Change-Id: Ia1aff1f865cc7ee0d09c4f990375ed1314603954