Merge "Fix clang static analyzer warnings." am: 94ae35de6c am: ecafd27df2
am: e4b8f60650

Change-Id: I2dca064165dc417488567d65fdd0df63f494efdc