Merge "Remove cookie parameter from updateFlags*."