Change ordering of call to super.

Change-Id: I20c851aff946884c84226bb789465eaa42093e71