Merge SlimPie

Change-Id: I524f47fc95346e7430fd16eed50b422029fe0331