Basic structural redefinition support am: c971eafeff
am: 279aa7a43d

Change-Id: Ie96c2aed80fb1eaa64dc7bc19535fdceb1fac1b5