Fix location services thx team eos

Change-Id: I8387ee6fab3c1eedfa1f0dae218594703acf5de7