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

Change-Id: I213780758114fa5fd8891e8d1b501ae7d9e68929