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

Change-Id: I03fbf818566f8c7601176dfd776edd24c126e27d