Fix for Location Services

Credit: nbehary@XDA
Merge remote-tracking branch 'origin/kitkat' into kitkat