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

Change-Id: Ifefb94babafa5ed947fb45a71625d49858278442