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

* commit 'a1e3895791ffaff12b0462ba82df906156ce1ae8':
  Fixing some warnings