Fix network location for all devices

Change-Id: Ic5fbee3efa80056822e192315a2d2d342988ab00