Use super to call parent methods

Change-Id: Ie5cc9a194e4c8ae3a7674f8e5ee44adb552ffc0c
Merge "Use super to call parent methods"