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

Change-Id: I4373290dc64ad8ebdc803b970279ecf2930b5199