FIxes + reconcile mka to kk44

Change-Id: I63b4a8eac831cf5aca0a230474b7366c87844b82