update from slimkernel

Change-Id: I3ab8dc5a58bde2cbb8085918aad89a18800991a1