Merge "ASoC: FM Playback and CS Voice call stops after power collapse" into msm-3.0