Fully reconcile manta with themuppets.

Change-Id: I48ef222d7f4c72d00abc35173c71050fb954b153