Merge "Store the correct rollback id for logging on boot complete"