merge caf latest BT commits into Slim

Change-Id: I1bc26db087c4f81bcf9880b42cce5a2adf1d3242