Full reconcile with Muppets for L

Change-Id: Ibec48c9fda92385f238dfefaf3cd952a5a2913fb