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

Change-Id: I01c7724eac803fcef442d35cbc1ed2b5fd01b711