Remove class-hierarchy restriction from structural redefinition am: fb53708751 am: e12a3d151e

Change-Id: Ic084a2d6de87bbf421014d8eaf049bc69e1d7351