Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d5 am: 6d0b4669 am: 95311818 am: e9b5b701 Change-Id: I80205377a19c45927a11fc14ab72c13a7479570b