[Cherry-pick] Use the correct handleMmi function am: a1e500b29a
am: 05a8c8a318

Change-Id: I4c274f2ace9ca5bf67c17f2b70ade42e06117eba