Merge "Minor Autofill changes after API council review." into oc-mr1-dev