am 477f1631: am 1e9c5754: am 01aa6a53: Merge "Fix Broken PreferenceWithHeadersTest" into ics-mr1

* commit '477f163112eb30bdb780b99092fd3269cad7ffb9':
  Fix Broken PreferenceWithHeadersTest