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

Change-Id: I4cbc7af573c4f4100e0a24c01d2f735bb2e9711b