Consistent creation/destruction of user data. am: be70c9a
am: c85be2f

* commit 'c85be2fc40ec7d7a70fee4b19325de21ff085724':

Change-Id: I93288ad9c962639dbfa63e33395f0ac3952b045b