Fix in GCM module and Logging related changes.