Fix a dual inheritance

Change-Id: I09269ee16df4a889c13335e0c5af14015449d4cf
14 files changed