Add KM 4.1 implementation am: 8ae41b5ed4
am: 96c5dbe3af

Change-Id: Ibdffbb49ebb86b1cb719e5fa29b77bf4d9123150