Merge "Fix clang-analyzer-core.uninitialized.Branch warnings"