am: 9ba4a2fa * commit '9ba4a2fa': Consistent creation/destruction of user data. Change-Id: Ic82e9b8e1b7eb49c1dd6d249d3011ab534547e89