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

Change-Id: I6b30af775a87c5f25e30a41c3db569dff6a8de74