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

Change-Id: Ib0d095ce2231d97bc544052f5047aa4695a11ae9