Fix for Location Services

Change-Id: I92dc7c8ab055dcf7b99aef89536cff72a1a1ef71