p880: reconcile with cm

Change-Id: Ie463198e3cfc325b44c555fc6865dca2471ea557