Merge "Renamed data/net service provider onDestroy to close"