Merge "Fix static analyzer warnings"
am: 9064b2d12a

Change-Id: I3e5ef8860968de0433cc3128ff69434ff0a3e8b1