Merge "Fix class/struct mismatch."
am: e91257f445

Change-Id: Iaed8abc05e6a5072086936c469a7501a229cb1ce