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

Change-Id: I328ca5045b1fabf9f6756cc0265458bda531fccf