Merge "Fix TransferOwnershipMetadataManager tests."