Merge "Fix class/struct mismatch." am: e91257f445 am: 6086fd39b3
am: ab266ea7dd

Change-Id: I761a6ef0c5123c5f9725ab0729011df164dfe0b8