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

Change-Id: I57f715b886515d53c25104b9952597a961fb3ca2