Fixed missing inherit @rlasalle15

Change-Id: Ie26baa2e1a99ec87045ec3fe5cb17679c7578072