Merge "Autofill fixes for secondary users:" into oc-dev
am: 6358cdcd28

Change-Id: Ic42bd782988bec610281b651346a5809e912c823