Merge "AddMembers.apply: Prevent NPE when account doesn't exist" into stable-2.9