am 8c6b9b0d: Merge "Fixes some warnings"

* commit '8c6b9b0d95974be3ba21c133661772206bc15e39':
  Fixes some warnings