Merge mklinaro into mka

Change-Id: Id8bdff662b427cacbb94c7c7ce464e315d6d1f5e