Fixed issue in structural redefinition around class init
am: fb11957a86

Change-Id: Icf56250686fc903368230b725d522529a0604291