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

Change-Id: I9f971b18ff7fa72241eb860a782c9a585f8e56f8