Fix derp and track Mms locally

Change-Id: Ic1d6fc0144582b764d7bc8bbffb5db09ed66d508