Merge "Fix struct vs. class mismatch in forward definitions" am: 1d6c149d89 am: 8806e2a789
am: 132b7491bc

Change-Id: Ibb73e33e1517a724dda605e5d38a57615e48c4e1