Fix Whisperpush and Voice+ when using the new Hangouts.

Change-Id: I1ae96354e8d5679d1e7b781875081cec08108691
Merge remote-tracking branch 'cm/cm-11.0' into HEAD