Reconile with Muppets for L

Change-Id: Idf1aefd65bd28081cb23d9f648570a369114eed7