Merge "Merge "Consistent creation/destruction of user data." into nyc-dev am: 82784bbe am: 8a00ab5a" into nyc-mr1-dev-plus-aosp