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

Change-Id: Ifcfe1c7bba201a8293ed00e7fdb1ff13c951da00