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

Change-Id: Ia2c1c3cf1987ac0567a6d04e8f9c10d4f2b62539