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

Change-Id: I3a22e9371e88ef13c2e3e67dbc9d716c789df80a