Update for Slim

Change-Id: I2a4972ec380b46bb505bd1d0cf9325dd9bdef69e