Merge "Reject ftp URLConnection containing /r/n in user info." into snap-temp-L07900000056674784