am 47771791: Merge "Fixed class previously declared as struct warning"

* commit '477717912d7bff1c0de856d26abb83d53c7cd66c':
  Fixed class previously declared as struct warning