Move data class out of auto-generated code.
am: 15b3ba7ede

Change-Id: I80291969e6874275c2f30072a59cdab49c2d9fd8