additional Fix for Location Services

Change-Id: I7cd572b85648bca6a7777f026be4933e7d71a9f0