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

Change-Id: I9ecdeadef84475e1bf028d05f8d5bc9b6a67a556