Changes for slimkat

Change-Id: I5d6e193422f361f1b04b8b19811936b4179e019c