Nozomi changes for Slim

Change-Id: Iff01a05f88c41709b8ebc1ec7b9fd0bab9cbce85