Transition to SickleRom

Change-Id: Id5daa694d2951802e7fc7c96161c9ff4e8a18af7