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

Change-Id: I62133ea583561f0408dba71fc804cd4f8be81016