Updating SmashPig to master

Change-Id: I266c0600adb582c5e881c2af7e3c7df6174ae3f9