am: 82784bbe * commit '82784bbe': Consistent creation/destruction of user data. Change-Id: I8f79173800fa8cc7d89ae0017fce0264e59d75c3