Fix Google Location Services.

Change-Id: I3e39f6aa9e8037fa69be142ea3a6db3f16cfdc4e