am d742fa3f: Merge "Fix build warnings"

* commit 'd742fa3f6074f52225cbea5acabb3404067e9d6a':
  Fix build warnings