Merge "Adding manual redirect support to developer.android.com." into ics-mr1