am 671a3a22: Merge "Fixing some warnings" into jb-mr1-dev

* commit '671a3a227c0ca880b0bf4ee93623efb61a4a6be5':
  Fixing some warnings