Fix some static analyser issues am: 300dae7c38
am: a1b97135eb

* commit 'a1b97135ebf696bbac3bb0e5e477fe5fa467e20b':
  Fix some static analyser issues