am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"

* commit '8c5ee61a057e3b87e8f0800b284642bf3b107fd0':
  Fix struct vs. class mismatches