am: 155cdf11 * commit '155cdf11': Consistent creation/destruction of user data. Change-Id: I48bf82191868340b256ecd6deecc56e5587072e2