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

Change-Id: I3cc44b1d742f48ee277233733f8a0616b79a4b62