Rebase BT of Slim's source

Change-Id: I15ac896aac8b09bced083dffe1ca6ac0e4782de6