Merge "Consistent creation/destruction of user data." into nyc-dev
am: 82784bb

* commit '82784bbeb8668c18f8cdbafaac3faab5d296e9ac':
  Consistent creation/destruction of user data.

Change-Id: Idb0b24fe8d908717b7d06715680609bf63da4bd5