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

Change-Id: Ifbbe4207f744ff55e990b86df0cebb10b59244e2