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

Change-Id: I85efdbc7a80f9851d67aa72142285b30ed7ace09