Update for Slim

Change-Id: I8bf262825da345a7a6d45b1f321dcf5efd432bb2