Merge "Fix app crash while adding new user"
am: 1e5cd4c3df

Change-Id: I0cb1c3a228b85edb6303d4f6c33037e4f787f550