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

Change-Id: I62945cd88eb6aec4caa90a72632f8e3660582291