Merge "Fix clang static analyzer warnings."
am: 1226a847e4

Change-Id: I4601d824f2214d010a6fbd09f746cf9495219066