am 7c0f2824: Merge "Fix build warnings"

* commit '7c0f2824f2f95c28b00d2581760fc7098beaa4e1':
  Fix build warnings