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

Change-Id: If2f5fd39fe829f44ed1c38309b3b908dc789bf33