Merge "Fix Broken PreferenceWithHeadersTest" into ics-mr1