Merge "Handle autofill auth scenarios where the FillContext cannot be retrieved:" into oc-mr1-dev