Merge "Update inheritance test implementation."
am: 31fba8cd40

Change-Id: I57935d1a08f1976d2301eee692ed823fb81bfcf4