Merge "Add user for credstore." am: 4659cdaf5c am: 66e60c7b77 am: 8e0e2797e6

Change-Id: I86961943c8ffb05878313db09ae8166d9fe59358