Tweak weather provider/location service code

Change-Id: I9334276560be28563530d2d503cdcba6109f099b
Merge "Tweak weather provider/location service code" into cm-10.2