Modified to use updated google-play-services_lib