Merge "Fix Key Management tests when delegating." into tm-dev