Merge "Revert "improve mism support for phonestatelistner"" am: 6eab01bf59
am: 8aca5c4cb8

Change-Id: I50c018de8637b4c94541b70ace1ba01ac7f9085e