changes for slim

Change-Id: Ia011dde37838f20681998f8212328ea8483447fc