Revert "Revert "Basic structural redefinition support"" am: 4ac0e1571e
am: d8f2cae00c

Change-Id: Ib932bce213aa093320e430ca2fb083ee985b674e