Merge "Fix clang-analyzer-core.uninitialized.Branch warnings" am: 4466170559 am: 21ff0aa9a8 am: 39004966a3 am: e9c10b5fab

Change-Id: Ifa72ce30a3ba51835847a359b1e46b845fe0107f