Merge "Fix struct vs. class mismatch in forward definitions"
am: 1d6c149d89

Change-Id: Iba83f822a72416e0b63b796f16065e8a672d66d9