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

* commit 'e34f078ab1c39048851c339224bf5af01c2ebada':

Change-Id: Iffada0a86632ce9be14f0bce36b19aa4cd6da529