Merge "Fix static analyzer warnings."
am: 5667da92fd

* commit '5667da92fd874c30eff40eae488ae6e05dba9d31':
  Fix static analyzer warnings.