Reconcile with themuppets

Change-Id: Iab71e739bdab1a770e8ea391bebf3734a0a45632