Fixed null extras
Updated GCM library