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

* commit '243a42a7993761845e7042f1845de50aba2ffc7a':
  Fix class vs. struct mismatch