Initial support for adding virtuals with structural redefinition am: 283bb322de
am: 2ccd438359

Change-Id: I383f97d09cede3ba9105dda8d546838375790b94