Merge "Fix static analyzer warnings"
am: 5e9fc32d46

Change-Id: I9778f003d8dfe64cfc2a8c4f2d19800835c7b403