Finished the location settings

Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9
8 files changed