Fix speaker phone

Change-Id: I2d7ddc413d018afa136f9c87bba4e6155b973abe
Merge branch 'cm-11.0' into martincz