am 6070dfcb: Merge change 22152 into eclair

Merge commit '6070dfcb6b216bd338874d7626aeb4c4ce93ea8e'

* commit '6070dfcb6b216bd338874d7626aeb4c4ce93ea8e':
  Fix a couple of compiler warnings.