Merge "Handle HTTP redirect (451) in OPTIONS and FolderSync" into ics-mr1