Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev