Added missing generated code from previous commits. Change-Id: Id7053e4cb5a085a4b047c86ff1f2269329ff7f54