Merge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe am: 41194d937c
am: 4b0f2f5150

Change-Id: Ic5ff05b44bcfe9edefff1044c78691d3fd6c9f98