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

Change-Id: I46e8c5de6f37fda698e00365c01e43b052885829