am 9342d910: am e92372ba: resolved conflicts for merge of 2237ca4c to jb-mr1-dev

* commit '9342d9101896d006a398de159409f08619fec004':
  Fixing signed/unsigned comparison warnings