Consistent creation/destruction of user data. am: be70c9a am: 30b0a1f
am: 0068f8e

* commit '0068f8e4907b82708822279dabf4710df3680beb':
  Consistent creation/destruction of user data.

Change-Id: I74206efb6610e72151878f6c432980b0293bea0e