reconcile p880 w/ themuppets

Change-Id: I192d9a2106bd5d19d5de95a5e27f817e81d2da99