am 9bb8e5cc: am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread

Merge commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429'

* commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429':
  Test that we don't leak sensitive information when logging cookies.