Merge "Fix static analyzer issues caught by clang"
am: c2c0df900d

* commit 'c2c0df900ded71aa3f7c9aee05614c7c050eef06':
  Fix static analyzer issues caught by clang