MoKeeHelper: Update

Change-Id: Ieb24d9e8f999abbdc1459eb21a78464182f4b3ea
MoKeeHelper: improve

Change-Id: I64bfe887e46b49ed5349cd5d8ec1efb2e953b359