Mokee modify (2 of 2)

Change-Id: I310fa3ead11a757076d93e469f86e7d6b2959702