Merge "auth: Follow up on e907d4328dc3e"