changes related to Gcm message format

Signed-off-by: Tajinder <tajindersingh4487@gmail.com>