Merge "Fix location settings bug on non-GPS devices" into pi-dev
am: b2637dac49

Change-Id: I538247bf9b4ccb735f5e84b7989683ea53344849