Merge "Fix clang-analyzer-core.uninitialized.Branch warnings" am: 54ac3c6932 am: 996530f7c1

Change-Id: Ic0e0fe3c131c1f9960251204db36a42d2e92035e