am 22536916: am 1bb53054: Merge "Fix class vs. struct mismatch"

* commit '22536916a5abd294ed4ccfa5bde9066305c81b48':
  Fix class vs. struct mismatch