Merge "Handle caremap for partial OTAs"