Merge "Moving location sockets from /data to /dev"