Merge "Fixed Autofill NPE that crashed some apps." into oc-dev
am: 75d0d92f7b

Change-Id: I0a0b70b0a6e476b038af6e58fa524eadd3856de2