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

Change-Id: Ib37b329e85dd3f72953b4f9b4eada5733976bead