[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: bfb1cdc6cc
am: b825046c97

Change-Id: I487b07a1bf1f87bc891de8b7e778bf7e7e14807f