Basic KSM support (2/2)

Change-Id: I8fab05063a6d48476eaa0c74094c1bb64af1801d