Merge "Don't call the destructor on the base class."
am: f80cad978c

Change-Id: I00518b01d84e26c496318547f1dceb90e17683f0