Updates from muppets

Change-Id: I29d250a455bd1c886872070fe7d9390cc198686a