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

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