Merge "Removes ParcelableHolder from HubServiceInfo" into main