Merge "Fix a bug that would access uninitialized data."