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

Change-Id: Ie05fbbeb119657cbae102e33baccf1677d1f4ba8