Bring in Shamu

Change-Id: If162dabeba80bd4d969e55e746ed6e7911ffa344