hammerhead: mokee modify

Change-Id: Ic984b5e8c8d73d830c2d1723ada104bfe0b22d0d