Rebase from Slim

Change-Id: Ib17cf147bec2803cfad1fe50c32341b7ffe9fb24