Merge "Fix uninitialized variable"