MoKee port

Change-Id: I2384e2091d2c6eed3cef95a98320dd8fe482b863