Merge "Setup flags for Credential Manager" into main