am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"

* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
  Fix class vs. struct mismatch