Full reconcile with Muppets for L

Change-Id: I922cac386c4127eb66e862dc34d748df856db314