Merge "Remove unnecessary inheritance" am: e2a67de73c
am: 91a62afc5b

Change-Id: I008fea77860eba2b89b0cb67ba50b9e20c883833