Updates from muppets

Change-Id: Ic4a56b2d4fedf938ec730058b26393f35fe80b0e