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

Change-Id: I6e0e1b3b1870445aabbc6058fe14cb7b5a05ef4a