Merge "Define contract for AutoFillServiceInfo more precisely."