Modified for mokee

Change-Id: Ie14c526861210fea684fce177c4ac308b62eb396