Merge "improve mism support for phonestatelistner" into qt-dev
am: 62751b8014

Change-Id: Ib46e711ff91b395c1e974a3eb641b0e9358f16da