Swrve 7193 improve swrve gcm intent service

https://swrvedev.jira.com/browse/SWRVE-7193