Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584
am: 6d0b466935

Change-Id: I9602684e0ac91f7c08dafe70309433bb233ceeaf