UPdating SmashPig to master

Change-Id: I8832ddb15a4d5b94bd3ebd75c0b2a3e8c16d2806