Basic structural redefinition support am: c971eafeff am: 279aa7a43d
am: bd9381487d

Change-Id: Ibe3631550cce03bf803efeda1c9d529b668cbc15