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

Change-Id: I259197408884f11e61f61e5241ee0012de28b54f