am c8871d2c: Merge "Fix struct vs. class mismatches"

* commit 'c8871d2cce58f7fa0985d4ace5fec73d468b1afd':
  Fix struct vs. class mismatches