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

Change-Id: I8fdad3951226ec06a87403ebd1fe4a4d84c5e98d