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

* commit '83d07f19945918b91c290143cb1be3a0126c61de':
  Fixed class previously declared as struct warning