Merge Slim Roms

Change-Id: Ib085a1ea2f0203456f3c5b3db8e04841327d858d
Merge Slim Roms

Change-Id: I413c56844fccc674251e6430234be7233cfae5cb