Slim rebase // bringup

Change-Id: I402dc42c4d6682dfced3461c85b9d39ee8d4ebcd