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

Change-Id: Ibb00e5b9acae869d54aeafeac09deec2f0d51acf