Merge "Fix struct vs. class mismatch in forward definitions" am: 8cdcd15c38 am: 5c9421500e
am: ef2e1afdc2

Change-Id: I1656836e48b6092602c0a4bf8135084fe8da7df5