reverting gcm receiver fix
Merge remote-tracking branch 'origin/altego' into altego