Merge "MMI code: Fix response state" am: 973706d124 am: fc82e64e58

Change-Id: I7193d719833faefdc9da179b8e4bbee4c497db4b