am 92591524: am e0b5c555: am 49f3ffd3: am 194dda10: Fix some warnings

* commit '92591524182a086e666f66e087032a646a27d20e':
  Fix some warnings