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

Change-Id: Idba9b96b45da08e43419b22f158d2d39632b869b