Fixed issue in structural redefinition around class init am: fb11957a86
am: fb563d9c60

Change-Id: I4f0ef091c4a8839e61520dfa48b702516c2243a7