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

Change-Id: I49067be08beac18a36c78225390e8f2a1018bac9