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

* commit 'ca5011dbcfcdf6d9ec267658bb1f18d907f6044e':
  Fixed class previously declared as struct warning