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

Change-Id: I23debe2e04ca73ea5a5aca4028e564f4d1a27b27