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

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

Change-Id: I8f79173800fa8cc7d89ae0017fce0264e59d75c3