MoKee Modify

Change-Id: I787155c7f6ed451af793a04406ee064a69823473