Merge "Fix MSIME client's active state"
am: ce745f4935

Change-Id: I44909a83382a18b4e68f714c2d7540647a47e7c7