am 51b15c3c: am 194dda10: Fix some warnings

* commit '51b15c3cc6a3d0610651e093c4ae5222ec8e0775':