Merge "Fix clang static analyzer warnings." am: b10d705f51
am: 87b2535ff8

Change-Id: I24784df53a0574974f822ee01e2a1f13729176c5