Bug 962299 - Bundle account data into a single userdata field

Not tested on device yet.