changes for slim

Change-Id: Ib35c87e89cf06d616b81cf16c167875518c33d4e