Merge "Test that we don't leak sensitive information when logging cookies." into gingerbread