fixed an issue with the sdk of google-play-services
Merge remote-tracking branch 'origin/master'