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

Change-Id: I0c10300fd1714d68769473ab28d90177cbf35162