Rebase from Slim

Change-Id: I495fc71e81af6ad0cbd691360e7b04e0cec1563c