Add more standard structural redefinition entrypoints
am: d55b844e39

Change-Id: I8b19baf3297b9d403c7147dca534fbbf9632f7bc