Basic structural redefinition support
am: c971eafeff

Change-Id: I8c3b693d047524d1829354139ab6bbb1cf618e4f