Remove class-hierarchy restriction from structural redefinition
am: fb53708751

Change-Id: I4363b8c98413c1c8a2a9882bc7bde17e11563ee8