am bacdfc0e: Merge "Fix compiling warnings"

* commit 'bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3':
  Fix compiling warnings