Follow our own p880 until to fix build

At least until CM fixes their cmhw

Change-Id: Ia076ed791955f83f5729b0789b18b23f0766151a