Add KM 4.1 implementation
am: 8ae41b5ed4

Change-Id: I0ac0dab58f803210750797b3807c7642f5b7d0d4