Merge "improve mism support for phonestatelistner" am: ed4d220c97
am: a05023c222

Change-Id: Icaade79b765a2c27bcf203f40a095b50d2087763