a006b15958
Also some minor cleanup of repeated code in user_model. PiperOrigin-RevId: 589135294 Change-Id: I16f22c4dbdde961cedc042af3bdc9d3577d33459