Merge "Fix struct vs. class mismatch in forward definitions" am: 76e37adc30
am: f4d7441eab

Change-Id: Ic484da88aba1e0e494e444515467570c22117a0e