Reconcile with themuppets

Change-Id: I38daa1ecc921bbd2fdc543727f5fe73f6916c001
Re-extractored

Change-Id: I39aa2a93ec74357111e2ff2692fd801ec8a649ce