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

Change-Id: Ic266dfc62284b345f707a3dee36e0dcf4faca328