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

Change-Id: I343ef4b72675c6e2f02a02c9516aaa8fa138529e