Merge "Moved WAN cache and relayer to /libs"