Merge "snapuserd: Address alignment fault on 32-bit systems"