Merge "Remove unnecessary inheritance"
am: e2a67de73c

Change-Id: I0625bd1416d77bb8bebcafea8b33fe8cbd72054b