Merge "Remove unnecessary inheritance" am: e2a67de73c am: 91a62afc5b am: 32411334fb
am: e85ce19dea

Change-Id: I548a2b79216c7614c702598ac5d01822e9c0bd4c