MARI-69 updated to store gcm registration id properly