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

Change-Id: Id2fef379c97ecb2b0745031896bac7d9a157d379